fix assertion failure in easygps related to new class UrlLink usage.
authortsteven4 <tsteven4@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Thu, 8 Aug 2013 09:32:46 +0000 (09:32 +0000)
committertsteven4 <tsteven4@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Thu, 8 Aug 2013 09:32:46 +0000 (09:32 +0000)
gpsbabel/easygps.cc

index cbca78c1b732c66b5c3259b82570c2c551da8ea8..a7b30c18b45c1b6a95c5c7796b2d74c23b335991 100644 (file)
@@ -171,14 +171,16 @@ ez_disp(const waypoint* wpt)
     gbfputc(5, file_out);
     gbfputpstr(wpt->notes, file_out);
   }
-  UrlLink link = wpt->GetUrlLink();
-  if (!link.url_link_text_.isEmpty()) {
-    gbfputc(6, file_out);
-    gbfputpstr(link.url_link_text_, file_out);
-  }
-  if (!link.url_.isEmpty()) {
-    gbfputc(9, file_out);
-    gbfputcstr(link.url_, file_out);
+  if (wpt->HasUrlLink()) {
+    UrlLink link = wpt->GetUrlLink();
+    if (!link.url_link_text_.isEmpty()) {
+      gbfputc(6, file_out);
+      gbfputpstr(link.url_link_text_, file_out);
+    }
+    if (!link.url_.isEmpty()) {
+      gbfputc(9, file_out);
+      gbfputcstr(link.url_, file_out);
+    }
   }
   gbfputc(0xff, file_out);
 }